* search.c (wordify): Use SDATA.

(Freplace_match): Use SREF.

diff --git a/src/search.c b/src/search.c
index 7ccdab568e1dbfce61db27c240d5f57e96b30a84..9b33e9e8d02440fd73068ab4e2540f2ed8f02311 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1994,7 +1994,7 @@ wordify (string)
 
       if (SYNTAX (c) == Sword)
        {
-         bcopy (&SREF (string, i_byte_orig), o,
+         bcopy (SDATA (string) + i_byte_orig, o,
                 i_byte - i_byte_orig);
          o += i_byte - i_byte_orig;
        }
@@ -2471,7 +2471,7 @@ since only regular expressions have distinguished subexpressions.  */)
          else
            {
              /* Note that we don't have to increment POS.  */
-             c = SDATA (newtext)[pos_byte++];
+             c = SREF (newtext, pos_byte++);
              if (buf_multibyte)
                c = unibyte_char_to_multibyte (c);
            }